Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Mon, 24 Aug 2015 15:57:03 +0000 (11:57 -0400)
committerTom Rini <[email protected]>
Mon, 24 Aug 2015 15:57:03 +0000 (11:57 -0400)

Trivial merge